+2001-02-19 Havoc Pennington <hp@redhat.com>
+
+ * gtk/gtktextbuffer.h (struct _GtkTextBufferClass): add
+ insert_child_anchor signal, bug #50245
+
+ * gtk/gtktextbtree.c (_gtk_text_btree_insert_child_anchor): change
+ from create_child_anchor, so the anchor is passed in
+
+ * gtk/gtktextchild.c (gtk_text_child_anchor_new): new function
+ (_gtk_widget_segment_new): have the child anchor object passed in,
+ instead of creating it.
+
+ * gtk/gtktextbuffer.c (gtk_text_buffer_modified): rename
+ to gtk_text_buffer_get_modified
+
2001-02-19 Havoc Pennington <hp@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
+2001-02-19 Havoc Pennington <hp@redhat.com>
+
+ * gtk/gtktextbuffer.h (struct _GtkTextBufferClass): add
+ insert_child_anchor signal, bug #50245
+
+ * gtk/gtktextbtree.c (_gtk_text_btree_insert_child_anchor): change
+ from create_child_anchor, so the anchor is passed in
+
+ * gtk/gtktextchild.c (gtk_text_child_anchor_new): new function
+ (_gtk_widget_segment_new): have the child anchor object passed in,
+ instead of creating it.
+
+ * gtk/gtktextbuffer.c (gtk_text_buffer_modified): rename
+ to gtk_text_buffer_get_modified
+
2001-02-19 Havoc Pennington <hp@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
+2001-02-19 Havoc Pennington <hp@redhat.com>
+
+ * gtk/gtktextbuffer.h (struct _GtkTextBufferClass): add
+ insert_child_anchor signal, bug #50245
+
+ * gtk/gtktextbtree.c (_gtk_text_btree_insert_child_anchor): change
+ from create_child_anchor, so the anchor is passed in
+
+ * gtk/gtktextchild.c (gtk_text_child_anchor_new): new function
+ (_gtk_widget_segment_new): have the child anchor object passed in,
+ instead of creating it.
+
+ * gtk/gtktextbuffer.c (gtk_text_buffer_modified): rename
+ to gtk_text_buffer_get_modified
+
2001-02-19 Havoc Pennington <hp@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
+2001-02-19 Havoc Pennington <hp@redhat.com>
+
+ * gtk/gtktextbuffer.h (struct _GtkTextBufferClass): add
+ insert_child_anchor signal, bug #50245
+
+ * gtk/gtktextbtree.c (_gtk_text_btree_insert_child_anchor): change
+ from create_child_anchor, so the anchor is passed in
+
+ * gtk/gtktextchild.c (gtk_text_child_anchor_new): new function
+ (_gtk_widget_segment_new): have the child anchor object passed in,
+ instead of creating it.
+
+ * gtk/gtktextbuffer.c (gtk_text_buffer_modified): rename
+ to gtk_text_buffer_get_modified
+
2001-02-19 Havoc Pennington <hp@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
+2001-02-19 Havoc Pennington <hp@redhat.com>
+
+ * gtk/gtktextbuffer.h (struct _GtkTextBufferClass): add
+ insert_child_anchor signal, bug #50245
+
+ * gtk/gtktextbtree.c (_gtk_text_btree_insert_child_anchor): change
+ from create_child_anchor, so the anchor is passed in
+
+ * gtk/gtktextchild.c (gtk_text_child_anchor_new): new function
+ (_gtk_widget_segment_new): have the child anchor object passed in,
+ instead of creating it.
+
+ * gtk/gtktextbuffer.c (gtk_text_buffer_modified): rename
+ to gtk_text_buffer_get_modified
+
2001-02-19 Havoc Pennington <hp@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
+2001-02-19 Havoc Pennington <hp@redhat.com>
+
+ * gtk/gtktextbuffer.h (struct _GtkTextBufferClass): add
+ insert_child_anchor signal, bug #50245
+
+ * gtk/gtktextbtree.c (_gtk_text_btree_insert_child_anchor): change
+ from create_child_anchor, so the anchor is passed in
+
+ * gtk/gtktextchild.c (gtk_text_child_anchor_new): new function
+ (_gtk_widget_segment_new): have the child anchor object passed in,
+ instead of creating it.
+
+ * gtk/gtktextbuffer.c (gtk_text_buffer_modified): rename
+ to gtk_text_buffer_get_modified
+
2001-02-19 Havoc Pennington <hp@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
+2001-02-19 Havoc Pennington <hp@redhat.com>
+
+ * gtk/gtktextbuffer.h (struct _GtkTextBufferClass): add
+ insert_child_anchor signal, bug #50245
+
+ * gtk/gtktextbtree.c (_gtk_text_btree_insert_child_anchor): change
+ from create_child_anchor, so the anchor is passed in
+
+ * gtk/gtktextchild.c (gtk_text_child_anchor_new): new function
+ (_gtk_widget_segment_new): have the child anchor object passed in,
+ instead of creating it.
+
+ * gtk/gtktextbuffer.c (gtk_text_buffer_modified): rename
+ to gtk_text_buffer_get_modified
+
2001-02-19 Havoc Pennington <hp@redhat.com>
* gtk/gtktreemodel.c (gtk_tree_model_get_valist): hmm, someone
insert_pixbuf_or_widget_segment (iter, seg);
}
-GtkTextChildAnchor*
-_gtk_text_btree_create_child_anchor (GtkTextIter *iter)
+void
+_gtk_text_btree_insert_child_anchor (GtkTextIter *iter,
+ GtkTextChildAnchor *anchor)
{
GtkTextLineSegment *seg;
GtkTextBTree *tree;
+
+ if (anchor->segment != NULL)
+ {
+ g_warning (G_STRLOC": Same child anchor can't be inserted twice");
+ return;
+ }
- seg = _gtk_widget_segment_new ();
+ seg = _gtk_widget_segment_new (anchor);
tree = seg->body.child.tree = _gtk_text_iter_get_btree (iter);
g_hash_table_insert (tree->child_anchor_table,
seg->body.child.obj,
seg->body.child.obj);
-
- return seg->body.child.obj;
}
void
void _gtk_text_btree_insert_pixbuf (GtkTextIter *iter,
GdkPixbuf *pixbuf);
-GtkTextChildAnchor* _gtk_text_btree_create_child_anchor (GtkTextIter *iter);
+void _gtk_text_btree_insert_child_anchor (GtkTextIter *iter,
+ GtkTextChildAnchor *anchor);
void _gtk_text_btree_unregister_child_anchor (GtkTextChildAnchor *anchor);
enum {
INSERT_TEXT,
INSERT_PIXBUF,
+ INSERT_CHILD_ANCHOR,
DELETE_RANGE,
CHANGED,
MODIFIED_CHANGED,
static void gtk_text_buffer_real_insert_pixbuf (GtkTextBuffer *buffer,
GtkTextIter *iter,
GdkPixbuf *pixbuf);
+static void gtk_text_buffer_real_insert_anchor (GtkTextBuffer *buffer,
+ GtkTextIter *iter,
+ GtkTextChildAnchor *anchor);
static void gtk_text_buffer_real_delete_range (GtkTextBuffer *buffer,
GtkTextIter *start,
GtkTextIter *end);
#endif
GTK_TYPE_POINTER,
GDK_TYPE_PIXBUF);
+
+ signals[INSERT_CHILD_ANCHOR] =
+ g_signal_newc ("insert_child_anchor",
+ G_TYPE_FROM_CLASS (object_class),
+ G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (GtkTextBufferClass, insert_child_anchor),
+ NULL,
+ gtk_marshal_VOID__BOXED_OBJECT,
+ GTK_TYPE_NONE,
+ 2,
+#if 0
+ /* FIXME */
+ GTK_TYPE_TEXT_ITER,
+#endif
+ GTK_TYPE_POINTER,
+ GTK_TYPE_TEXT_CHILD_ANCHOR);
signals[DELETE_RANGE] =
g_signal_newc ("delete_range",
* Child anchor
*/
+
+static void
+gtk_text_buffer_real_insert_anchor (GtkTextBuffer *buffer,
+ GtkTextIter *iter,
+ GtkTextChildAnchor *anchor)
+{
+ _gtk_text_btree_insert_child_anchor (iter, anchor);
+
+ g_signal_emit (G_OBJECT (buffer), signals[CHANGED], 0);
+}
+
+/**
+ * gtk_text_buffer_insert_child_anchor:
+ * @buffer: a #GtkTextBuffer
+ * @iter: location to insert the anchor
+ * @anchor: a #GtkTextChildAnchor
+ *
+ * Inserts a child widget anchor into the text buffer at @iter. The
+ * anchor will be counted as one character in character counts, and
+ * when obtaining the buffer contents as a string, will be represented
+ * by the Unicode "object replacement character" 0xFFFC. Note that the
+ * "slice" variants for obtaining portions of the buffer as a string
+ * include this character for pixbufs, but the "text" variants do
+ * not. e.g. see gtk_text_buffer_get_slice() and
+ * gtk_text_buffer_get_text(). Consider
+ * gtk_text_buffer_create_child_anchor() as a more convenient
+ * alternative to this function. The buffer will add a reference to
+ * the anchor, so you can unref it after insertion.
+ *
+ **/
+void
+gtk_text_buffer_insert_child_anchor (GtkTextBuffer *buffer,
+ GtkTextIter *iter,
+ GtkTextChildAnchor *anchor)
+{
+ GtkTextChildAnchor *anchor;
+
+ g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
+ g_return_val_if_fail (iter != NULL, NULL);
+ g_return_val_if_fail (GTK_IS_TEXT_CHILD_ANCHOR (anchor), NULL);
+
+ g_signal_emit (G_OBJECT (buffer), signals[INSERT_CHILD_ANCHOR], 0,
+ iter, anchor);
+}
+
+
+/**
+ * gtk_text_buffer_create_child_anchor:
+ * @buffer: a #GtkTextBuffer
+ * @iter: location in the buffer
+ *
+ * This is a convenience function which simply creates a child anchor
+ * with gtk_text_child_anchor_new() and inserts it into the buffer
+ * with gtk_text_buffer_insert_child_anchor().
+ *
+ * Return value: the created child anchor
+ **/
GtkTextChildAnchor*
gtk_text_buffer_create_child_anchor (GtkTextBuffer *buffer,
GtkTextIter *iter)
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), NULL);
g_return_val_if_fail (iter != NULL, NULL);
- anchor = _gtk_text_btree_create_child_anchor (iter);
+ anchor = gtk_text_child_anchor_new ();
- /* FIXME child-anchor-specific signal */
-
- gtk_signal_emit (GTK_OBJECT (buffer), signals[CHANGED]);
+ gtk_text_buffer_insert_child_anchor (buffer, iter, anchor);
+
+ g_object_unref (G_OBJECT (anchor));
return anchor;
}
-
/*
* Mark manipulation
*/
*/
/**
- * gtk_text_buffer_modified:
+ * gtk_text_buffer_get_modified:
* @buffer: a #GtkTextBuffer
*
* Indicates whether the buffer has been modified since the last call
* Return value: %TRUE if the buffer has been modified
**/
gboolean
-gtk_text_buffer_modified (GtkTextBuffer *buffer)
+gtk_text_buffer_get_modified (GtkTextBuffer *buffer)
{
g_return_val_if_fail (GTK_IS_TEXT_BUFFER (buffer), FALSE);
GtkTextIter *pos,
GdkPixbuf *pixbuf);
-#if 0
- /* FIXME To do this, first have to implement the sequence
- * gtk_text_child_anchor_new(); gtk_text_buffer_insert_child_anchor();
- */
- void (* insert_child_anchor) (GtkTextBuffer *buffer,
- GtkTextIter *pos,
+ void (* insert_child_anchor) (GtkTextBuffer *buffer,
+ GtkTextIter *pos,
GtkTextChildAnchor *anchor);
-#endif
void (* delete_range) (GtkTextBuffer *buffer,
GtkTextIter *start,
GtkTextIter *iter,
GdkPixbuf *pixbuf);
-/* Create a child anchor */
+/* Insert a child anchor */
+void gtk_text_buffer_insert_child_anchor (GtkTextBuffer *buffer,
+ GtkTextIter *iter,
+ GtkTextChildAnchor *anchor);
+
+/* Convenience, create and insert a child anchor */
GtkTextChildAnchor *gtk_text_buffer_create_child_anchor (GtkTextBuffer *buffer,
GtkTextIter *iter);
flag, but if you would like them to you can connect a handler to
the tag/mark signals and call set_modified in your handler */
-gboolean gtk_text_buffer_modified (GtkTextBuffer *buffer);
+gboolean gtk_text_buffer_get_modified (GtkTextBuffer *buffer);
void gtk_text_buffer_set_modified (GtkTextBuffer *buffer,
gboolean setting);
+ sizeof (GtkTextChildBody)))
GtkTextLineSegment *
-_gtk_widget_segment_new (void)
+_gtk_widget_segment_new (GtkTextChildAnchor *anchor)
{
GtkTextLineSegment *seg;
*/
seg->char_count = 1;
- seg->body.child.obj = g_object_new (GTK_TYPE_TEXT_CHILD_ANCHOR, NULL);
+ seg->body.child.obj = anchor;
seg->body.child.obj->segment = seg;
seg->body.child.widgets = NULL;
seg->body.child.tree = NULL;
seg->body.child.line = NULL;
+ g_object_ref (G_OBJECT (anchor));
+
return seg;
}
object_class->finalize = gtk_text_child_anchor_finalize;
}
+GtkTextChildAnchor*
+gtk_text_child_anchor_new (void)
+{
+ return GTK_TEXT_CHILD_ANCHOR (g_object_new (GTK_TYPE_TEXT_CHILD_ANCHOR,
+ NULL));
+}
+
static void
gtk_text_child_anchor_finalize (GObject *obj)
{
GType gtk_text_child_anchor_get_type (void) G_GNUC_CONST;
+GtkTextChildAnchor* gtk_text_child_anchor_new (void);
+
GList* gtk_text_child_anchor_get_widgets (GtkTextChildAnchor *anchor);
gboolean gtk_text_child_anchor_get_deleted (GtkTextChildAnchor *anchor);
GtkTextLine *line;
};
-GtkTextLineSegment *_gtk_widget_segment_new (void);
+GtkTextLineSegment *_gtk_widget_segment_new (GtkTextChildAnchor *anchor);
void _gtk_widget_segment_add (GtkTextLineSegment *widget_segment,
GtkWidget *child);
void _gtk_widget_segment_remove (GtkTextLineSegment *widget_segment,
GdkPixbuf *pixbuf;
int i;
char *str;
- GtkTextChildAnchor *anchor;
/* FIXME this is broken if called twice on a buffer, since
* we try to create tags a second time.
"direction", GTK_TEXT_DIR_RTL,
"indent", 30,
"left_margin", 20,
- "right_margin", 20,
+ "right_margin", 20,
NULL);
get_empty_view (View *view)
{
if (!view->buffer->filename &&
- !gtk_text_buffer_modified (view->buffer->buffer))
+ !gtk_text_buffer_get_modified (view->buffer->buffer))
return view;
else
return create_view (create_buffer ());
static gboolean
check_buffer_saved (Buffer *buffer)
{
- if (gtk_text_buffer_modified (buffer->buffer))
+ if (gtk_text_buffer_get_modified (buffer->buffer))
{
char *pretty_name = buffer_pretty_name (buffer);
char *msg = g_strdup_printf ("Save changes to '%s'?", pretty_name);
GdkPixbuf *pixbuf;
int i;
char *str;
- GtkTextChildAnchor *anchor;
/* FIXME this is broken if called twice on a buffer, since
* we try to create tags a second time.
"direction", GTK_TEXT_DIR_RTL,
"indent", 30,
"left_margin", 20,
- "right_margin", 20,
+ "right_margin", 20,
NULL);
get_empty_view (View *view)
{
if (!view->buffer->filename &&
- !gtk_text_buffer_modified (view->buffer->buffer))
+ !gtk_text_buffer_get_modified (view->buffer->buffer))
return view;
else
return create_view (create_buffer ());
static gboolean
check_buffer_saved (Buffer *buffer)
{
- if (gtk_text_buffer_modified (buffer->buffer))
+ if (gtk_text_buffer_get_modified (buffer->buffer))
{
char *pretty_name = buffer_pretty_name (buffer);
char *msg = g_strdup_printf ("Save changes to '%s'?", pretty_name);
projects / gtk4.git / commitdiff